From 512a0ebf006d73b6e87990b53c0e0d1e449a6f7d Mon Sep 17 00:00:00 2001 From: =?utf8?q?S=C3=B8ren=20Sandmann=20Pedersen?= Date: Wed, 22 Dec 2004 19:25:42 +0000 Subject: [PATCH] Conflict markers --- ChangeLog | 1 - ChangeLog.pre-2-10 | 1 - ChangeLog.pre-2-6 | 1 - ChangeLog.pre-2-8 | 1 - 4 files changed, 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 90cd56e704..6f411ab779 100644 --- a/ChangeLog +++ b/ChangeLog @@ -90,7 +90,6 @@ Wed Dec 22 01:24:01 2004 Jonathan Blandford (gtk_about_dialog_init): Add missing initializations. (#161646, Torsten Schoenfeld) ->>>>>>> 1.6233 2004-12-16 Matthias Clasen * configure.in: Bump version diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 90cd56e704..6f411ab779 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -90,7 +90,6 @@ Wed Dec 22 01:24:01 2004 Jonathan Blandford (gtk_about_dialog_init): Add missing initializations. (#161646, Torsten Schoenfeld) ->>>>>>> 1.6233 2004-12-16 Matthias Clasen * configure.in: Bump version diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 90cd56e704..6f411ab779 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -90,7 +90,6 @@ Wed Dec 22 01:24:01 2004 Jonathan Blandford (gtk_about_dialog_init): Add missing initializations. (#161646, Torsten Schoenfeld) ->>>>>>> 1.6233 2004-12-16 Matthias Clasen * configure.in: Bump version diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 90cd56e704..6f411ab779 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -90,7 +90,6 @@ Wed Dec 22 01:24:01 2004 Jonathan Blandford (gtk_about_dialog_init): Add missing initializations. (#161646, Torsten Schoenfeld) ->>>>>>> 1.6233 2004-12-16 Matthias Clasen * configure.in: Bump version -- 2.30.2